bitkeeper revision 1.1159.255.2 (4209127er8MJffd33h0Xohwj83BUWQ)

misc VT-x cleanups
Signed-off-by: ian.pratt@cl.cam.ac.uk

diff --git a/xen/arch/x86/vmx.c b/xen/arch/x86/vmx.c
index 7f6d1ae198d8d13cf954c7f4ab246ada3daaeda1..ebc7e1d0a4f38b37de5081a1ded2695a1bf476ed 100644 (file)
--- a/xen/arch/x86/vmx.c
+++ b/xen/arch/x86/vmx.c
@@ -828,7 +828,7 @@ asmlinkage void vmx_vmexit_handler(struct xen_regs regs)
     case EXIT_REASON_EXTERNAL_INTERRUPT: 
     {
         extern int vector_irq[];
-        extern asmlinkage void do_IRQ(struct xen_regs);
+        extern asmlinkage void do_IRQ(struct xen_regs *);
         extern void smp_apic_timer_interrupt(struct xen_regs *);
         extern void timer_interrupt(int, void *, struct xen_regs *);
         unsigned int    vector;
@@ -845,7 +845,7 @@ asmlinkage void vmx_vmexit_handler(struct xen_regs regs)
         } else {
             regs.entry_vector = (vector == FIRST_DEVICE_VECTOR?
                      0 : vector_irq[vector]);
-            do_IRQ(regs);
+            do_IRQ(&regs);
         }
         break;
     }

diff --git a/xen/include/asm-x86/shadow.h b/xen/include/asm-x86/shadow.h
index 0131af81bd1ad59232685b4aff9e4ee123e2cce1..5f972f7aca4b004d147ab1b73b4ca6b3e350979d 100644 (file)
--- a/xen/include/asm-x86/shadow.h
+++ b/xen/include/asm-x86/shadow.h
@@ -73,9 +73,9 @@ static inline void shadow_invalidate(struct exec_domain *ed) {
     memset(ed->arch.shadow_vtable, 0, PAGE_SIZE);
 }
 
-#define SHADOW_DEBUG 1
+#define SHADOW_DEBUG 0
 #define SHADOW_VERBOSE_DEBUG 0
-#define SHADOW_HASH_DEBUG 1
+#define SHADOW_HASH_DEBUG 0
 
 struct shadow_status {
     unsigned long pfn;            /* Guest pfn.             */